[cherry-pick] [cherry-pick] agentHost: Preserve workspace transition boundaries - #334793
[cherry-pick] [cherry-pick] agentHost: Preserve workspace transition boundaries#334793vs-code-engineering[bot] wants to merge 2 commits into
Conversation
There was a problem hiding this comment.
🟡 Changes recommended
Unresolved merge-conflict markers are committed, which will break parsing/compilation and must be resolved before approval.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Backport/cherry-pick to release/1.137 for the agent host workspace-conversion UX, focused on preserving the always-visible “Now working in” workspace transition boundary across collapsed progress and restarts.
Changes:
- Preserve workspace transition boundaries across collapsed completed steps and Agent Host restarts.
- Skip workspace trust prompts when effective permissions are “Allow All” or global auto-approve is enabled.
- Persist/restore transition state atomically while hiding the internal continuation request but keeping attribution.
Blocking issue observed: merge-conflict markers are committed in src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts (and also present in extensions/copilot/script/test/scoredEditsReconciler.spec.ts in this branch snapshot), so the branch will not compile/test until conflicts are resolved.
File summaries
| File | Description |
|---|---|
| src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts | Test setup for workspace transition rendering currently contains unresolved merge-conflict markers that must be resolved. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| <<<<<<< HEAD | ||
| ======= | ||
| configurationService.setUserConfiguration(ChatConfiguration.TurnStatusPills, false); | ||
| >>>>>>> f9a273540ca ([cherry-pick] agentHost: Preserve workspace transition boundaries (#334694)) |
Benjamin Christopher Simmonds (benibenj)
left a comment
There was a problem hiding this comment.
merge markers!
Cherry-pick of #334694 from
release/1.137.<<<<<<</=======/>>>>>>>) are committed to the branch — check it out locally, resolve, and force-push.Conflicting files:
src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.tsSummary
Backport of #334534 to
release/1.137.Now working inworkspace transition boundary across collapsed progress and Agent Host restartsThis branch contains only the five commits from #334534. The prerequisite workspace-conversion implementation from #334250 is already present on
release/1.137.Validation
npm run typecheck-clientnpm run transpile-clientgit diff --check